label: Activate default via action
authorMatthias Clasen <mclasen@redhat.com>
Sun, 28 Apr 2019 18:12:15 +0000 (18:12 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 28 Apr 2019 23:20:13 +0000 (23:20 +0000)
Switch to the new way of activating default.

gtk/gtklabel.c

index 05f2c8c5379e196a66a5c173fb43c56e6d8622c7..5d18a7567f1533b9a7675ecf4286ef7ed9ad4263 100644 (file)
@@ -6203,31 +6203,9 @@ gtk_label_activate_current_link (GtkLabel *label)
   link = gtk_label_get_focus_link (label);
 
   if (link)
-    {
-      emit_activate_link (label, link);
-    }
+    emit_activate_link (label, link);
   else
-    {
-      GtkWidget *toplevel;
-      GtkWindow *window;
-      GtkWidget *default_widget, *focus_widget;
-
-      toplevel = gtk_widget_get_toplevel (widget);
-      if (GTK_IS_WINDOW (toplevel))
-        {
-          window = GTK_WINDOW (toplevel);
-
-          if (window)
-            {
-              default_widget = gtk_window_get_default_widget (window);
-              focus_widget = gtk_root_get_focus (GTK_ROOT (window));
-
-              if (default_widget != widget &&
-                  !(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget))))
-                gtk_window_activate_default (window);
-            }
-        }
-    }
+    gtk_widget_activate_default (widget);
 }
 
 static GtkLabelLink *